From: Robert Lipe Date: Thu, 20 Dec 2018 04:19:40 +0000 (-0600) Subject: Remove xstrrstr and BASE_STRUCT from defs.h X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~8^2~26^2~8 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=530dd328882cc3d4d1a494920799de1c8b110d45;p=gpsbabel.git Remove xstrrstr and BASE_STRUCT from defs.h --- diff --git a/defs.h b/defs.h index b0df8e743..b0d493b0e 100644 --- a/defs.h +++ b/defs.h @@ -145,9 +145,6 @@ */ -#define BASE_STRUCT(memberp, struct_type, member_name) \ - ((struct_type *)((char *)(memberp) - offsetof(struct_type, member_name))) - /* * Define globally on which kind of data gpsbabel is working. * Important for "file types" that are essentially a communication @@ -1016,7 +1013,7 @@ QString strenquote(const QString& str, const QChar quot_char); char* strsub(const char* s, const char* search, const char* replace); char* gstrsub(const char* s, const char* search, const char* replace); -const char* xstrrstr(const char* s1, const char* s2); + void rtrim(char* s); char* lrtrim(char* buff); int xasprintf(char** strp, const char* fmt, ...) PRINTFLIKE(2, 3);